Remove some read-only struct members in xml_tag. Passes vtesto.

diff --git a/gpsbabel/gpx.cc b/gpsbabel/gpx.cc
index d7a2ade69336271185fd320b5a0ce09b51e0fe8b..cd3f87e5da1f3824393af95b6af1baf90e3a58ec 100644 (file)
--- a/gpsbabel/gpx.cc
+++ b/gpsbabel/gpx.cc
@@ -1189,7 +1189,6 @@ gpx_end(const QString& el)
 static void
 gpx_cdata(const QString& s)
 {
-  int* cdatalen;
   char** cdata;
   xml_tag* tmp_tag;
   cdatastr = s;
@@ -1204,10 +1203,8 @@ gpx_cdata(const QString& s)
       tmp_tag = tmp_tag->sibling;
     }
     cdata = &(tmp_tag->parentcdata);
-    cdatalen = &(tmp_tag->parentcdatalen);
   } else {
     cdata = &(cur_tag->cdata);
-    cdatalen = &(cur_tag->cdatalen);
   }
   if (*cdata) {
     xfree(*cdata);
@@ -1362,12 +1359,10 @@ fprint_xml_chain(xml_tag* tag, const waypoint* wpt)
       }
       writer->writeEndElement();
     }
-    if (tag->parentcdata) {
+    if (tag->parentcdata && tag->parentcdata[0]) {
       // FIXME: The length check is necessary to get line endings correct in our test suite.
       // Writing the zero length string eats a newline, at least with Qt 4.6.2.
-      if (tag->parentcdatalen > 0) {
-        writer->writeCharacters(tag->parentcdata);
-      }
+      writer->writeCharacters(tag->parentcdata);
     }
     tag = tag->sibling;
   }

diff --git a/gpsbabel/src/core/xmltag.h b/gpsbabel/src/core/xmltag.h
index dadab96bcaff1226ebf61d7c62bd728e6b639f90..41ce891fd64fc04fc412cee704ca74f0c724896a 100644 (file)
--- a/gpsbabel/src/core/xmltag.h
+++ b/gpsbabel/src/core/xmltag.h
@@ -21,9 +21,7 @@ class xml_tag {
   xml_tag() :
     tagname(NULL),
     cdata(NULL),
-    cdatalen(0),
     parentcdata(NULL),
-    parentcdatalen(0),
     attributes(NULL),
     parent(NULL),
     sibling(NULL),
@@ -31,9 +29,7 @@ class xml_tag {
 
   char* tagname;
   char* cdata;
-  int cdatalen;
   char* parentcdata;
-  int parentcdatalen;
   char** attributes;
   xml_tag* parent;
   xml_tag* sibling;